<!doctype html>
<html lang="en">
<head>
  <meta charset="UTF-8">
  <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
        name="viewport">
  <meta content="ie=edge" http-equiv="X-UA-Compatible">
  <title>Document</title>
</head>
<body>
<!--
  1、功能分支写完代码
  2、先要把功能分支的代码提交到本地仓库 git add .  git commit -m '提交消息'
  3、切换主分支 git checkout master
  4、功能分支代码合并到主分支 git merge 分支名
-->

<h2>修改了代码</h2>
<h1>修改了远程的代码</h1>
</body>
</html>
